From: Sam Steingold <sds@gnu.org>
Date: Fri, 14 Aug 2009 04:24:01 +0000 (+0000)
Subject: (vc-cvs-merge-news): Yet annother fix of message parsing.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11115
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=30f1040751b55fb570c5befbf4a4ef9f47a7f13d;p=emacs.git

(vc-cvs-merge-news): Yet annother fix of message parsing.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca7cc805b70..4eca8d90491 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-14  Sam Steingold  <sds@gnu.org>
+
+	* vc-cvs.el (vc-cvs-merge-news): Yet annother fix of message parsing.
+
 2009-08-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* faces.el (help-argument-name): Define it here instead of
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 6ef8db50537..9d153e5c9fc 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -458,7 +458,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
           (if (re-search-forward
                (concat "^\\([CMUP] \\)?"
                        (regexp-quote
-                        (substring file (length default-directory)))
+                        (substring file (length (expand-file-name
+                                                 "." default-directory))))
                        "\\( already contains the differences between \\)?")
                nil t)
               (cond